Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: merge 7.16.0 into 7.17.0 #8613

Merged
merged 2 commits into from
Feb 16, 2024
Merged

chore: merge 7.16.0 into 7.17.0 #8613

merged 2 commits into from
Feb 16, 2024

Conversation

sethkfman
Copy link
Contributor

@sethkfman sethkfman commented Feb 16, 2024 •
edited
Loading

Description

This PR merges 7.16.0 into 7.17.0 the major conflict that occurred was in the migration files. The PR creates a migration file 29 that applies the changes which were in main.

Related issues

Fixes:

Manual testing steps

  1. Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

  • I’ve followed MetaMask Coding Standards.
  • I've clearly explained what problem this PR is solving and how it is solved.
  • I've linked related issues
  • I've included manual testing steps
  • I've included screenshots/recordings if applicable
  • I’ve included tests if applicable
  • I’ve documented my code using JSDoc format if applicable
  • I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.
  • I’ve properly set the pull request status:
    • In case it's not yet "ready for review", I've set it to "draft".
    • In case it's "ready for review", I've changed it from "draft" to "non-draft".

Pre-merge reviewer checklist

  • I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
  • I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

@sethkfman sethkfman requested a review from a team as a code owner February 16, 2024 21:39
@github-actions GitHub Actions
Copy link
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@sethkfman sethkfman added the Run Smoke E2E Triggers smoke e2e on Bitrise label Feb 16, 2024
sethkfman
sethkfman commented Feb 16, 2024
View reviewed changes
README.md Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

E2E test started on Bitrise: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/93c750f1-6998-4b9a-a7a0-4afda6590afe
You can also kick off another Bitrise E2E smoke test by removing and re-applying the (Run Smoke E2E) label

@sethkfman sethkfman changed the title resolved merge coflicts with 7.16.0, required state migration flow up… chore: merge 7.16.0 into 7.17.0 Feb 16, 2024
Cal-L
Cal-L approved these changes Feb 16, 2024
View reviewed changes
Copy link
Contributor

@Cal-L Cal-L left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, can merge once smoke tests pass

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Feb 16, 2024

Quality Gate Passed Quality Gate passed

Issues
4 New issues

Measures
0 Security Hotspots
84.9% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@sethkfman sethkfman merged commit 28bf9fc into release/7.17.0 Feb 16, 2024
27 checks passed
@sethkfman sethkfman deleted the chore/merge-7.16.0 branch February 16, 2024 22:54
@github-actions github-actions bot locked and limited conversation to collaborators Feb 16, 2024
@metamaskbot metamaskbot added the release-7.17.0 Issue or pull request that will be included in release 7.17.0 label Mar 1, 2024
@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-7.17.0 on PR, as PR was added to branch 7.17.0 when release was cut.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Cal-L Cal-L Cal-L approved these changes

Assignees
No one assigned
Labels
release-7.17.0 Issue or pull request that will be included in release 7.17.0 Run Smoke E2E Triggers smoke e2e on Bitrise
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sethkfman @metamaskbot @Cal-L